Skip to content

deps: Update annotate-snippets#6947

Merged
ytmimi merged 1 commit into
rust-lang:mainfrom
clubby789:bump-annotate-snippets
Jul 22, 2026
Merged

deps: Update annotate-snippets#6947
ytmimi merged 1 commit into
rust-lang:mainfrom
clubby789:bump-annotate-snippets

Conversation

@clubby789

@clubby789 clubby789 commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

As in #6391, rustc has moved to annotate-snippets 0.12. This updates rustfmt's dependency to match, following the migration guide.

@rustbot rustbot added the S-waiting-on-review Status: awaiting review from the assignee but also interested parties. label Jun 16, 2026
@clubby789

clubby789 commented Jun 16, 2026

Copy link
Copy Markdown
Contributor Author
image Ouput comparison

@ytmimi ytmimi self-assigned this Jun 16, 2026
ytmimi
ytmimi reviewed Jun 23, 2026
View reviewed changes
Comment thread src/format_report_formatter.rs
@ytmimi

ytmimi commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: awaiting review from the assignee but also interested parties. labels Jun 23, 2026
@rustbot

rustbot commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@clubby789
clubby789 force-pushed the bump-annotate-snippets branch from 5bbdf78 to 415f5b0 Compare June 23, 2026 10:35
@clubby789

clubby789 commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: awaiting some action (such as code changes or more information) from the author. labels Jun 23, 2026
@clubby789

clubby789 commented Jun 23, 2026

Copy link
Copy Markdown
Contributor Author

I might work on adding a snapshot based test suite that tests the stderr of rustfmt (to catch the above), sound useful?

@ytmimi

ytmimi commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

@clubby789 that would be fantastic!

@clubby789 clubby789 mentioned this pull request Jul 17, 2026
Merged
@ytmimi

ytmimi commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

@clubby789 now that we have the snapshot tests merged let's rebase these changes on main so we can re-trigger CI to make sure everything is working correctly.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: awaiting review from the assignee but also interested parties. labels Jul 22, 2026
@clubby789
clubby789 force-pushed the bump-annotate-snippets branch from 415f5b0 to 3eceb09 Compare July 22, 2026 13:34
@rustbot

rustbot commented Jul 22, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@ytmimi

ytmimi commented Jul 22, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Looks like the snapshot tests are already helping out here!

---- test::warning_tests stdout ----
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ Snapshot Summary ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
Snapshot file: tests/warning/snapshots/line_overflow.snap
Snapshot: line_overflow
Source: src/test/mod.rs:287
────────────────────────────────────────────────────────────────────────────────
-old snapshot
+new results
────────────┬───────────────────────────────────────────────────────────────────
    2     2 │  --> tests/warning/source/line_overflow.rs:1:1:101
    3     3 │   |
    4     4 │ 1 | fn this_function_name_is_intentionally_long_enough_to_exceed_the_default_one_hundred_character_maximum_width(
    5     5 │   |                                                                                                     ^^^^^^^^^
    6       │-  |
    7     6 │ 
    8     7 │ warning: rustfmt has failed to format. See previous 1 errors.
────────────┴───────────────────────────────────────────────────────────────────
Stopped on the first failure. Run `cargo insta test` to run all snapshots.

Maybe we actually need that extra newline that I commented about back in #6947 (comment)?

@clubby789
clubby789 force-pushed the bump-annotate-snippets branch from 3eceb09 to da43be5 Compare July 22, 2026 20:29
@clubby789
clubby789 force-pushed the bump-annotate-snippets branch from da43be5 to 45ab15a Compare July 22, 2026 20:47
ytmimi
ytmimi approved these changes Jul 22, 2026
View reviewed changes

@ytmimi ytmimi left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing the failing test!

View changes since this review

@ytmimi
ytmimi merged commit aceacbf into rust-lang:main Jul 22, 2026
26 checks passed
@rustbot rustbot added release-notes Needs an associated changelog entry and removed S-waiting-on-author Status: awaiting some action (such as code changes or more information) from the author. labels Jul 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ytmimi ytmimi ytmimi approved these changes

Assignees

@ytmimi ytmimi

Labels

release-notes Needs an associated changelog entry

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@clubby789 @ytmimi @rustbot